Update cmake file installation to prepare itk-4.9

diff --git a/debian/changelog b/debian/changelog
index a8707caf1b9e686a070d9d966dcaf22fa6be7625..6d7571c3b5a8d8920ce0d6a09820eb5972f46b31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dcmtk (3.6.1~20150924-5) UNRELEASED; urgency=medium
+
+  * d/libdcmtk-dev revert last change since ITK-4.9 now supports
+    properly the dcmtk*.cmake files.
+  * d/control: conflict with older versions of libinsighttoolkit-dev
+
+ -- Gert Wollny <gw.fossdev@gmail.com>  Sat, 30 Jan 2016 22:52:38 +0100
+
 dcmtk (3.6.1~20150924-4) unstable; urgency=medium
 
   * Do not install DCMTK*.cmake files, they break things.

diff --git a/debian/control b/debian/control
index 5e913e90499b6a7c2bd930ddcdb1781d87c2d703..855a9c2ffc20616b5b453098a1936e98575dc905 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,7 @@ Depends: libxml2-dev,
          libdcmtk5 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: dcmtk-doc
-Conflicts: libdcmtk2-dev, libdcmtk4-dev 
+Conflicts: libdcmtk2-dev, libdcmtk4-dev, libinsighttoolkit4-dev (< 4.9.0)
 Provides: libdcmtk2-dev
 Replaces: libdcmtk2-dev, libdcmtk4-dev 
 Description: OFFIS DICOM toolkit development libraries and headers

diff --git a/debian/libdcmtk-dev.install b/debian/libdcmtk-dev.install
index 2c5ae4aeea3c23131ce51690071386ccf9728d56..ec97f9e84fd6bce5ce3021ac577962932e17595f 100644 (file)
--- a/debian/libdcmtk-dev.install
+++ b/debian/libdcmtk-dev.install
@@ -1,2 +1,4 @@
 usr/include/dcmtk/*
-usr/lib/*.so
\ No newline at end of file
+usr/lib/*.so
+usr/lib/cmake/
+